From d1f2cb63d9ca3448634b833cfc75007e9d61a1dc Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 14 Jun 2005 17:16:15 +0000 Subject: [PATCH] Use a named cursor with the name "color-picker", when available. 2005-06-14 Matthias Clasen * gtk/gtkcolorsel.c (make_picker_cursor): Use a named cursor with the name "color-picker", when available. --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ ChangeLog.pre-2-8 | 3 +++ gtk/gtkcolorsel.c | 40 +++++++++++++++++++++++++--------------- 4 files changed, 34 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index da98a6a3e3..dae77c7f1f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-06-14 Matthias Clasen + * gtk/gtkcolorsel.c (make_picker_cursor): Use a named cursor + with the name "color-picker", when available. + * gdk/gdk.symbols: * gdk/gdkcursor.h: * gdk/x11/gdkcursor-x11.c (gdk_cursor_get_image) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index da98a6a3e3..dae77c7f1f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2005-06-14 Matthias Clasen + * gtk/gtkcolorsel.c (make_picker_cursor): Use a named cursor + with the name "color-picker", when available. + * gdk/gdk.symbols: * gdk/gdkcursor.h: * gdk/x11/gdkcursor-x11.c (gdk_cursor_get_image) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index da98a6a3e3..dae77c7f1f 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,8 @@ 2005-06-14 Matthias Clasen + * gtk/gtkcolorsel.c (make_picker_cursor): Use a named cursor + with the name "color-picker", when available. + * gdk/gdk.symbols: * gdk/gdkcursor.h: * gdk/x11/gdkcursor-x11.c (gdk_cursor_get_image) diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c index 1f61d108f2..e0199f3586 100644 --- a/gtk/gtkcolorsel.c +++ b/gtk/gtkcolorsel.c @@ -1175,24 +1175,34 @@ static GdkCursor * make_picker_cursor (GdkScreen *screen) { GdkCursor *cursor; - GdkColor bg = { 0, 0xffff, 0xffff, 0xffff }; - GdkColor fg = { 0, 0x0000, 0x0000, 0x0000 }; - GdkWindow *window = gdk_screen_get_root_window (screen); - - GdkPixmap *pixmap = - gdk_bitmap_create_from_data (window, (gchar *) dropper_bits, - DROPPER_WIDTH, DROPPER_HEIGHT); - GdkPixmap *mask = - gdk_bitmap_create_from_data (window, (gchar *) dropper_mask, - DROPPER_WIDTH, DROPPER_HEIGHT); + cursor = gdk_cursor_new_from_name (gdk_screen_get_display (screen), + "color-picker"); - cursor = gdk_cursor_new_from_pixmap (pixmap, mask, &fg, &bg, - DROPPER_X_HOT, DROPPER_Y_HOT); - - g_object_unref (pixmap); - g_object_unref (mask); + if (!cursor) + { + GdkColor bg = { 0, 0xffff, 0xffff, 0xffff }; + GdkColor fg = { 0, 0x0000, 0x0000, 0x0000 }; + GdkWindow *window; + GdkPixmap *pixmap, *mask; + window = gdk_screen_get_root_window (screen); + + pixmap = + gdk_bitmap_create_from_data (window, (gchar *) dropper_bits, + DROPPER_WIDTH, DROPPER_HEIGHT); + + mask = + gdk_bitmap_create_from_data (window, (gchar *) dropper_mask, + DROPPER_WIDTH, DROPPER_HEIGHT); + + cursor = gdk_cursor_new_from_pixmap (pixmap, mask, &fg, &bg, + DROPPER_X_HOT, DROPPER_Y_HOT); + + g_object_unref (pixmap); + g_object_unref (mask); + } + return cursor; } -- 2.30.2